Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 23 Nov 2006 17:54:06 +0000 (17:54 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 23 Nov 2006 17:54:06 +0000 (17:54 +0000)

Trivial merge